merge emacs-23
authorKenichi Handa <handa@etlken>
Wed, 18 Aug 2010 08:03:46 +0000 (17:03 +0900)
committerKenichi Handa <handa@etlken>
Wed, 18 Aug 2010 08:03:46 +0000 (17:03 +0900)

Trivial merge